Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-39322: [release-4.18]fix ts2phc leap window check #357

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-39322: [release-4.18]fix ts2phc leap window check #357

wants to merge 1 commit into from
+35 −57

Conversation

vitus133
Copy link
Contributor

@vitus133 vitus133 commented Sep 1, 2024

This fixes the leap window condition check when receiving ts2phc status messages. Any of them should not cause "nmea string lost" event during the leap second clock irregularity.

/cc @aneeshkp @jzding @josephdrichard @nishant-parekh

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2024
@vitus133 vitus133 changed the title fix ts2phc leap window check OCPBUGS-39187: fix ts2phc leap window check Sep 1, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 1, 2024
@openshift-ci-robot
Copy link
Contributor

@vitus133: This pull request references Jira Issue OCPBUGS-39187, which is invalid:

  • expected the bug to target either version "4.18." or "openshift-4.18.", but it targets "4.17.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This fixes the leap window condition check when receiving ts2phc status messages. Any of them should not cause "nmea string lost" event during the leap second clock irregularity.

/cc @aneeshkp @jzding @josephdrichard @nishant-parekh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 1, 2024
@vitus133 vitus133 changed the title OCPBUGS-39187: fix ts2phc leap window check fix ts2phc leap window check Sep 1, 2024
@openshift-ci-robot openshift-ci-robot removed jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 1, 2024
@openshift-ci-robot
Copy link
Contributor

@vitus133: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

This fixes the leap window condition check when receiving ts2phc status messages. Any of them should not cause "nmea string lost" event during the leap second clock irregularity.

/cc @aneeshkp @jzding @josephdrichard @nishant-parekh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@vitus133 vitus133 changed the title fix ts2phc leap window check OCPBUGS-39322: [release-4.18]fix ts2phc leap window check Sep 1, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 1, 2024
@openshift-ci-robot
Copy link
Contributor

@vitus133: This pull request references Jira Issue OCPBUGS-39322, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This fixes the leap window condition check when receiving ts2phc status messages. Any of them should not cause "nmea string lost" event during the leap second clock irregularity.

/cc @aneeshkp @jzding @josephdrichard @nishant-parekh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@vitus133
fix ts2phc leap window check
084903b 
This fixes the leap window condition check when receiving
ts2phc status messages. Any of them should not cause "nmea string lost"
event during the leap second clock irregularity.
This commit also refactors leap file mocking in unit tests, eliminating
code duplication

Signed-off-by: Vitaly Grinberg <[email protected]>
aneeshkp
aneeshkp reviewed Sep 25, 2024
View reviewed changes
pkg/daemon/daemon.go
!leap.LeapMgr.IsLeapInWindow(time.Now().UTC(), -2*time.Second, time.Second) &&
(strings.Contains(output, NMEASourceDisabledIndicator) ||
strings.Contains(output, InvalidMasterTimestampIndicator) ||
strings.Contains(output, NMEASourceDisabledIndicator2)) { //TODO identify which interface lost nmea or 1pps
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't nmea lost indicator always for GM interface ? GM interface will give the nmea interface , until we support two GNSS

Copy link
Contributor Author

@vitus133 vitus133 Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, only for GM interface. I only extended the condition for declaring "nmea string lost", that we are not in the leap event right now to all nmea failure kinds, because I noticed they could be different while I was checking the 4.14 backport

aneeshkp
aneeshkp approved these changes Sep 26, 2024
View reviewed changes
Copy link
Contributor

@aneeshkp aneeshkp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 26, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aneeshkp, vitus133

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 26, 2024

@vitus133: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/unit-test 084903b link unknown /test unit-test
ci/prow/e2e-aws 084903b link unknown /test e2e-aws
ci/prow/images 084903b link unknown /test images
ci/prow/gofmt 084903b link unknown /test gofmt

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aneeshkp aneeshkp aneeshkp approved these changes

@josephdrichard josephdrichard Awaiting requested review from josephdrichard

@jzding jzding Awaiting requested review from jzding

@nishant-parekh nishant-parekh Awaiting requested review from nishant-parekh

Assignees

@aneeshkp aneeshkp

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vitus133 @openshift-ci-robot @openshift-merge-robot @aneeshkp